Autogenerated HTML docs for v1.6.5.2-215-g77097f
diff --git a/gitglossary.html b/gitglossary.html index 719bf82..a6fcc82 100644 --- a/gitglossary.html +++ b/gitglossary.html
@@ -556,7 +556,7 @@ </p> </dd> <dt> -<a id="def_fast_forward"></a>fast forward +<a id="def_fast_forward"></a>fast-forward </dt> <dd> <p> @@ -719,7 +719,7 @@ conflict, manual intervention may be required to complete the merge. </p> -<div class="para"><p>As a noun: unless it is a <a href="#def_fast_forward">fast forward</a>, a +<div class="para"><p>As a noun: unless it is a <a href="#def_fast_forward">fast-forward</a>, a successful merge results in the creation of a new <a href="#def_commit">commit</a> representing the result of the merge, and having as <a href="#def_parent">parents</a> the tips of the merged <a href="#def_branch">branches</a>. @@ -1166,7 +1166,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-11-15 09:57:26 UTC +Last updated 2009-11-16 02:10:15 UTC </div> </div> </body>
